From 91123adba78f3bb7a50079e5d7e107bc5e2dc43e Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 8 Jan 2016 16:48:01 +0100 Subject: [PATCH] Adwaita: remove some now uneeded selectors ...related to image-button sizing which is handled differently now. --- gtk/theme/Adwaita/_common.scss | 10 -------- gtk/theme/Adwaita/gtk-contained-dark.css | 29 ++++++++---------------- gtk/theme/Adwaita/gtk-contained.css | 29 ++++++++---------------- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 80ce5cf950..ec5c0e5820 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3289,15 +3289,6 @@ colorswatch { } } -GtkScaleButton.button, -GtkVolumeButton.button { - // I assume both are image-button *by default* - // with the image-button/text-button classes automagically applied depending on the button child these selectors can be deleted. - @extend .image-button; - - &.text-button { @extend button.text-button } -} - /********************** * Window Decorations * *********************/ @@ -3366,7 +3357,6 @@ headerbar button.titlebutton, .titlebar button.titlebutton { @extend button; @extend button.flat; - @extend .image-button; @include _button_text_shadow; &:backdrop { -gtk-icon-shadow: none; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 977819f946..9ec4f4f07f 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -465,8 +465,7 @@ button, headerbar button.titlebutton, outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } - button.osd.image-button, headerbar button.osd.titlebutton, - .titlebar button.osd.titlebutton { + button.osd.image-button { min-height: 48px; min-width: 48px; } button.osd:hover { @@ -957,18 +956,13 @@ button, headerbar button.titlebutton, box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } - button.text-button, GtkScaleButton.button.text-button, - GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton, + button.text-button, headerbar button.text-button.titlebutton, .titlebar button.text-button.titlebutton { padding-left: 16px; padding-right: 16px; } - button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child, - GtkVolumeButton.button.text-button label:first-child, headerbar button.text-button.titlebutton label:first-child, - .titlebar button.text-button.titlebutton label:first-child { + button.text-button.image-button label:first-child { padding-left: 8px; } - button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child, - GtkVolumeButton.button.text-button label:last-child, headerbar button.text-button.titlebutton label:last-child, - .titlebar button.text-button.titlebutton label:last-child { + button.text-button.image-button label:last-child { padding-right: 8px; } .stack-switcher > button, headerbar .stack-switcher > button.titlebutton, .titlebar .stack-switcher > button.titlebutton { @@ -983,16 +977,12 @@ button, headerbar button.titlebutton, padding-right: 6px; padding-top: 3px; padding-bottom: 3px; } - .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button, - .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button, - headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button, - .titlebar .stack-switcher > button.text-button.titlebutton, - .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button, - .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button { + .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton, + .titlebar .stack-switcher > button.text-button.titlebutton { padding-left: 10px; padding-right: 10px; } - .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton, - .titlebar .stack-switcher > button.titlebutton { + .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton, + .titlebar .stack-switcher > button.image-button.titlebutton { padding-left: 2px; padding-right: 2px; } .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { @@ -4620,8 +4610,7 @@ frame.keycap { *:drop(active) { border: 1px solid black; } -stackswitcher button.text-button, stackswitcher GtkScaleButton.button.text-button, -stackswitcher GtkVolumeButton.button.text-button, +stackswitcher button.text-button, stackswitcher .titlebar button.text-button.titlebutton, .titlebar stackswitcher button.text-button.titlebutton { min-width: 100px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f6c3c05064..3efff0d54d 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -465,8 +465,7 @@ button, headerbar button.titlebutton, outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } - button.osd.image-button, headerbar button.osd.titlebutton, - .titlebar button.osd.titlebutton { + button.osd.image-button { min-height: 48px; min-width: 48px; } button.osd:hover { @@ -957,18 +956,13 @@ button, headerbar button.titlebutton, box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } - button.text-button, GtkScaleButton.button.text-button, - GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton, + button.text-button, headerbar button.text-button.titlebutton, .titlebar button.text-button.titlebutton { padding-left: 16px; padding-right: 16px; } - button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child, - GtkVolumeButton.button.text-button label:first-child, headerbar button.text-button.titlebutton label:first-child, - .titlebar button.text-button.titlebutton label:first-child { + button.text-button.image-button label:first-child { padding-left: 8px; } - button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child, - GtkVolumeButton.button.text-button label:last-child, headerbar button.text-button.titlebutton label:last-child, - .titlebar button.text-button.titlebutton label:last-child { + button.text-button.image-button label:last-child { padding-right: 8px; } .stack-switcher > button, headerbar .stack-switcher > button.titlebutton, .titlebar .stack-switcher > button.titlebutton { @@ -983,16 +977,12 @@ button, headerbar button.titlebutton, padding-right: 6px; padding-top: 3px; padding-bottom: 3px; } - .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button, - .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button, - headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button, - .titlebar .stack-switcher > button.text-button.titlebutton, - .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button, - .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button { + .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton, + .titlebar .stack-switcher > button.text-button.titlebutton { padding-left: 10px; padding-right: 10px; } - .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton, - .titlebar .stack-switcher > button.titlebutton { + .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton, + .titlebar .stack-switcher > button.image-button.titlebutton { padding-left: 2px; padding-right: 2px; } .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { @@ -4797,8 +4787,7 @@ frame.keycap { *:drop(active) { border: 1px solid black; } -stackswitcher button.text-button, stackswitcher GtkScaleButton.button.text-button, -stackswitcher GtkVolumeButton.button.text-button, +stackswitcher button.text-button, stackswitcher .titlebar button.text-button.titlebutton, .titlebar stackswitcher button.text-button.titlebutton { min-width: 100px; } -- 2.30.2